Use function WinOpenURL and readme.html for help.

diff --git a/gpsbabel/win32/gui-2/about.pas b/gpsbabel/win32/gui-2/about.pas
index a92dba09053eb4c6160c2782ca8cb39876c9fc5b..f112cd833454a1812fd29d83117a7aba5dd5cc6f 100644 (file)
--- a/gpsbabel/win32/gui-2/about.pas
+++ b/gpsbabel/win32/gui-2/about.pas
@@ -113,7 +113,7 @@ end;
 procedure TfrmAbout.lbURLClick(Sender: TObject);\r
 begin\r
   TLabel(Sender).Font.Color := clBlue;\r
-  WinOpenFile('http://' + TLabel(Sender).Caption);\r
+  WinOpenFile('http://' + TLabel(Sender).Caption, '');\r
 end;\r
 \r
 procedure TfrmAbout.FormKeyDown(Sender: TObject; var Key: Word;\r

diff --git a/gpsbabel/win32/gui-2/common.pas b/gpsbabel/win32/gui-2/common.pas
index 8c1804a8694ff915d67184796618056425f8e680..0dcdddb8e31ee9d56212025ff95ca50ea840cc90 100644 (file)
--- a/gpsbabel/win32/gui-2/common.pas
+++ b/gpsbabel/win32/gui-2/common.pas
@@ -21,12 +21,15 @@ unit common;
 interface\r
 \r
 uses\r
-  Windows, SysUtils, Classes, Messages, Controls, StdCtrls;\r
+  Windows, SysUtils, Classes, Messages, Controls, StdCtrls, Inifiles;\r
 \r
 const\r
   OTypes: array[0..6] of PChar =\r
     ('unknown', 'integer', 'float', 'string', 'boolean', 'file', 'outfile');\r
-    \r
+\r
+  gpsbabel_knows_inifile: Boolean = False;\r
+  gpsbabel_ini: TInifile = nil;\r
+  \r
 resourcestring\r
   SGPSBabelURL = 'http://www.gpsbabel.org';\r
   SGPSBabelTitle = 'GPSBabelGUI-2';\r
@@ -394,6 +397,12 @@ begin
          \r
          i := SELF.Add(name);\r
          SELF.PutObject(i, Pointer(info));\r
+\r
+         if (name = 'garmin_txt') then\r
+         begin\r
+           gpsbabel_knows_inifile := True;\r
+           // add -p "" to command-line\r
+         end;\r
          break;\r
        end;\r
     end;\r

diff --git a/gpsbabel/win32/gui-2/filter.pas b/gpsbabel/win32/gui-2/filter.pas
index 27180e295110b224914e36169676e487a47ed6a7..ddc92b92a501029b1b6b4e31252f3f8e768de691 100644 (file)
--- a/gpsbabel/win32/gui-2/filter.pas
+++ b/gpsbabel/win32/gui-2/filter.pas
@@ -24,7 +24,7 @@ uses
   gnugettext, gnugettextDx,\r
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,\r
   StdCtrls, ComCtrls, Buttons, Mask, ExtCtrls,\r
-  common;\r
+  common, utils;\r
 \r
 type\r
   TfrmFilter = class(TForm)\r
@@ -81,6 +81,7 @@ type
     edWayptRadiusLat: TEdit;\r
     edWayptRadiusLon: TEdit;\r
     cbTrackRangeTimeZone: TCheckBox;\r
+    BitBtn2: TBitBtn;\r
     procedure cbTrackTimeClick(Sender: TObject);\r
     procedure FormCreate(Sender: TObject);\r
     procedure cbTrackTitleClick(Sender: TObject);\r
@@ -97,6 +98,7 @@ type
     procedure FormShow(Sender: TObject);\r
     procedure FormKeyDown(Sender: TObject; var Key: Word;\r
       Shift: TShiftState);\r
+    procedure BitBtn2Click(Sender: TObject);\r
   private\r
     { Private-Deklarationen }\r
     lTrackTimeList: TList;\r
@@ -533,4 +535,9 @@ begin
   ModalResult := mrCancel;\r
 end;\r
 \r
+procedure TfrmFilter.BitBtn2Click(Sender: TObject);\r
+begin\r
+  WinOpenURL(readme_html_path + '#id274853');\r
+end;\r
+\r
 end.\r

diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas
index b0ebe3eb477afcc7ae7c4664b2804ff63e3c7d39..44c578746fb6e1f34845aabf6e43a57bb754a844 100644 (file)
--- a/gpsbabel/win32/gui-2/main.pas
+++ b/gpsbabel/win32/gui-2/main.pas
@@ -23,7 +23,7 @@ interface
 uses\r
   gnugettext, TypInfo, delphi, \r
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,\r
-  StdCtrls, Buttons, ExtCtrls,\r
+  StdCtrls, Buttons, ExtCtrls, \r
   common, utils, ImgList, ActnList, Menus, ComCtrls, ToolWin;\r
 \r
 type\r
@@ -337,6 +337,7 @@ begin
     else if (gpsbabel_vfmt >= '001.002.005') then\r
       gpsbabel('-^2', l)\r
     else begin\r
+      MessageBox(0, PChar(gpsbabel_vfmt), 'Release info', MB_OK);\r
       MessageDlg(_('The file "gpsbabel.exe" found in current directory is too old!'),\r
         mtError, [mbOK], 0);\r
       Halt(1);\r
@@ -362,14 +363,17 @@ begin
 end;\r
 \r
 procedure TfrmMain.WMSTARTUP(var Msg: TMessage);\r
+var\r
+  s: string;\r
 begin\r
+//  gpsbabel_ini := TIniFile.Create('gpsbabel.ini');\r
   LoadVersion;\r
   EnableOptions(gpsbabel_vfmt);\r
   LoadFileFormats;\r
 \r
   // ? valid README form\r
-\r
-  acHelpReadme.Enabled := (frmReadme.Memo.Lines.Count > 0);\r
+  s := ExtractFilePath(ParamStr(0)) + 'readme.html';\r
+  acHelpReadme.Enabled := FileExists(s) or (frmReadme.Memo.Lines.Count > 0);\r
 end;\r
 \r
 procedure TfrmMain.InitCombo(Target: TComboBox; IsInput, ForDevice: Boolean);\r
@@ -566,6 +570,7 @@ begin
     acFinalizeDropDownsExecute(nil);\r
 \r
     cmdline := '';\r
+    if gpsbabel_knows_inifile then cmdline := '-p ""';\r
 \r
     if chbInputDevice.Checked then\r
       IFormat := FCaps.GetName(cbInputFormatDevice.Text)\r
@@ -766,7 +771,7 @@ begin
   \r
   l := TStringList.Create;\r
   try\r
-    if not gpsbabel('-V', l) then Exit;\r
+    if not gpsbabel('-p "" -V', l) then Exit;\r
 \r
     for i := 0 to l.Count - 1 do\r
     begin\r
@@ -899,10 +904,17 @@ begin
 end;\r
 \r
 procedure TfrmMain.acHelpReadmeExecute(Sender: TObject);\r
+var\r
+  s: string;\r
 begin\r
-  if (frmReadme = nil) then\r
-    Application.CreateForm(TfrmReadme, frmReadme);\r
-  frmReadme.ShowModal;\r
+  s := ExtractFilePath(ParamStr(0)) + 'readme.html';\r
+  if FileExists(s) then\r
+    WinOpenFile(s, '')   // new readme.html\r
+  else begin // show the old readme\r
+    if (frmReadme = nil) then\r
+      Application.CreateForm(TfrmReadme, frmReadme);\r
+    frmReadme.ShowModal;\r
+  end;\r
 end;\r
 \r
 procedure TfrmMain.mnuSynthesizeShortNamesClick(Sender: TObject);\r
@@ -1152,6 +1164,7 @@ begin
         WriteLn('msgstr ""');\r
         WriteLn('');\r
       end;\r
+      MessageDlg('..\gpsbabel.po created!', mtInformation, [mbok], 0);\r
     finally\r
       f.Free;\r
     end;\r

diff --git a/gpsbabel/win32/gui-2/options.pas b/gpsbabel/win32/gui-2/options.pas
index 14a85d859341544171bb1f69cfca29d8ca6bcf70..0056924bb90ccc4b90bd865b6936a8ea0023fea4 100644 (file)
--- a/gpsbabel/win32/gui-2/options.pas
+++ b/gpsbabel/win32/gui-2/options.pas
@@ -172,7 +172,7 @@ begin
     if (FFormat = '') then\r
     begin\r
       FFormat := o.format;\r
-      btnHelp.Hint := 'http://www.gpsbabel.org/readme.html#' + FFormat;\r
+      btnHelp.Hint := readme_html_path + '#' + FFormat;\r
       btnHelp.ShowHint := True;\r
     end;\r
 \r
@@ -462,7 +462,7 @@ end;
 \r
 procedure TfrmOptions.btnHelpClick(Sender: TObject);\r
 begin\r
-  WinOpenFile('http://www.gpsbabel.org/readme.html#' + FFormat);\r
+  WinOpenURL(readme_html_path + '#' + FFormat);\r
 end;\r
 \r
 procedure TfrmOptions.CreateFileOption(const x, y, tag: Integer; o: POption; IsInput: Boolean; xmax: Integer = -1);\r